From 2734340a750a32b55f876e4bb6bd1f42e97b4e08 Mon Sep 17 00:00:00 2001 From: tsteven4 Date: Tue, 10 Jun 2014 21:34:33 +0000 Subject: [PATCH] fix up regex matches in track discard filter. --- gpsbabel/discard.cc | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/gpsbabel/discard.cc b/gpsbabel/discard.cc index 4b0cfa863..6c0f68e03 100644 --- a/gpsbabel/discard.cc +++ b/gpsbabel/discard.cc @@ -237,19 +237,23 @@ fix_init(const char* args) if (nameopt) { name_regex.setCaseSensitivity(Qt::CaseInsensitive); + name_regex.setPatternSyntax(QRegExp::WildcardUnix); name_regex.setPattern(nameopt); } if (descopt) { desc_regex.setCaseSensitivity(Qt::CaseInsensitive); - desc_regex.setPattern(nameopt); + desc_regex.setPatternSyntax(QRegExp::WildcardUnix); + desc_regex.setPattern(descopt); } - if (nameopt) { - name_regex.setCaseSensitivity(Qt::CaseInsensitive); - name_regex.setPattern(nameopt); + if (cmtopt) { + cmt_regex.setCaseSensitivity(Qt::CaseInsensitive); + cmt_regex.setPatternSyntax(QRegExp::WildcardUnix); + cmt_regex.setPattern(cmtopt); } if (iconopt) { icon_regex.setCaseSensitivity(Qt::CaseInsensitive); - icon_regex.setPattern(nameopt); + icon_regex.setPatternSyntax(QRegExp::WildcardUnix); + icon_regex.setPattern(iconopt); } } -- 2.30.2